]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
util: Handle .rc in version comparisons
authorFlorian Müllner <fmuellner@gnome.org>
Fri, 19 Jan 2024 21:56:59 +0000 (22:56 +0100)
committerMarge Bot <marge-bot@gnome.org>
Fri, 26 Jan 2024 13:20:07 +0000 (13:20 +0000)
We somehow missed that the new version scheme include '.rc' when
adding the comparison function, whoops.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3130>

js/misc/util.js
tests/unit/versionCompare.js

index de5e6d86185ee7bb24df5ae6490a528a222e63d7..508c87d24cf4080e561cffb5622c400aa3cb0a6e 100644 (file)
@@ -294,8 +294,10 @@ function _GNOMEversionToNumber(version) {
     if (!isNaN(ret))
         return ret;
     if (version === 'alpha')
-        return -2;
+        return -3;
     if (version === 'beta')
+        return -2;
+    if (version === 'rc')
         return -1;
     return ret;
 }
index 549afeecd45d00417050f77d2e104c91757e100e..39388a3b0591bfa315efcda94daf415f7c705fda 100644 (file)
@@ -36,7 +36,7 @@ const tests = [
     },
     {
         v1: '40',
-        v2: '3.38.0',
+        v2: '40.rc',
         res: 1,
     },
     {